Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move trace descriptions out of success/failure sentences in emails #5487

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Move trace descriptions out of success/failure sentences in emails #5487

merged 1 commit into from
Jan 9, 2025
+54 −38

Conversation

AntonKhorev
Copy link
Collaborator

@AntonKhorev AntonKhorev commented Jan 9, 2025 •
edited
Loading

Fixes #4012. As I say in #4012 (comment) the current success/failure sentences are too long because we try to put in trace name/description/tags into them. I don't think anyone wants to read sentences that long. Shorter sentences won't have to be combined from parts, which will improve translatability.

Before

HTML success email:
image

After

HTML success email:
image

HTML failure email:
image

Plaintext success email:

Hi fakeuser1,

It looks like your file loaded successfully with 295 out of a possible 295 points.

Your file details:

Filename
	11716462.gpx
URL
	http://openstreetmap.example.com/user/fakeuser1/traces/100
Description
	new trace description here
Tags
	new, trace, tags, here


All your successfully uploaded GPX traces can be found at http://openstreetmap.example.com/traces/mine

Plaintext failure email:

Hi fakeuser1,

It looks like your file failed to be imported as a GPS trace.

Your file details:

Filename
	Screenshot_from_2025_01_06_12_50_06.png
Description
	new trace description here
Tags
	new, trace, tags, here


Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:

==
Fatal error: Start tag expected, '<' not found at :1.
==

More information about GPX import failures and how to avoid them can be found at https://wiki.openstreetmap.org/wiki/GPX_Import_Failures

@AntonKhorev AntonKhorev marked this pull request as ready for review January 9, 2025 11:34
nenad-vujicic
nenad-vujicic approved these changes Jan 9, 2025
View reviewed changes
Copy link
Contributor

@nenad-vujicic nenad-vujicic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works and looks great on my side. Thank you very much!

I would just suggest putting the property and value in the same row, as shown in

image

However, this is a bit subjective and can be addressed in another PR if others prefer.

@AntonKhorev
Copy link
Collaborator Author

I would just suggest putting the property and value in the same row

In the plaintext version? I didn't do that because I didn't want to count characters in localization strings.

@tomhughes
Copy link
Member

I don't think we need to worry too much about the details of the text version as most people are never going to see it.

This looks pretty good to me I think, thanks.

@tomhughes tomhughes merged commit a6c6f26 into openstreetmap:master Jan 9, 2025
21 checks passed
@AntonKhorev AntonKhorev deleted the gpx-emails branch January 10, 2025 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nenad-vujicic nenad-vujicic nenad-vujicic approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Further rework lego messages for trace notification emails
3 participants
@AntonKhorev @tomhughes @nenad-vujicic